in_systemd: Process enumerated data as cfl_kvlist(s) at first #9291
+562
−53
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
cosmo0920
force-pushed
the
cosmo0920-process-as_cfl-variant-at-first-on-in_systemd
branch
from
7c4c98b to
0a500fb
Compare
cosmo0920
force-pushed
the
cosmo0920-process-as_cfl-variant-at-first-on-in_systemd
branch
from
0a500fb to
347c77b
Compare
cosmo0920
force-pushed
the
cosmo0920-process-as_cfl-variant-at-first-on-in_systemd
branch
from
78aeb85 to
518204b
Compare
cosmo0920
force-pushed
the
cosmo0920-process-as_cfl-variant-at-first-on-in_systemd
branch
from
57d2cb4 to
6ed3974
Compare
|
Oh, just conflicted after merging es responses testing PR. I'll fix it. |
Signed-off-by: Hiroshi Hatake <[email protected]>
Signed-off-by: Hiroshi Hatake <[email protected]>
This is because systemctl's -o json-pretty or -o json converts duplicated keys' values as array(s). To avoid generating the duplicated key(s) does not resolve this issue. Instead, we need to store as cfl_kvlist at first to detect duplicated keys on enumerated data in journal storage. Then, we also need to generate as msgpack's array format when the duplicated key(s) were detected and translated as array format when storing as cfl_kvlist(s). Signed-off-by: Hiroshi Hatake <[email protected]>
Signed-off-by: Hiroshi Hatake <[email protected]>
cosmo0920
force-pushed
the
cosmo0920-process-as_cfl-variant-at-first-on-in_systemd
branch
from
6ed3974 to
b570622
Compare
edsiper
deleted the
cosmo0920-process-as_cfl-variant-at-first-on-in_systemd
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is because systemctl's -o json-pretty or -o json converts duplicated keys' values as array(s).
To avoid generating the duplicated key(s) does not resolve this issue. Instead, we need to store as cfl_kvlist at first to detect duplicated keys on enumerated data in journal storage.
Then, we also need to generate as msgpack's array format when the duplicated key(s) were detected and translated as array format when storing as cfl_kvlist(s).
Closes #501.
Enter
[N/A]in the box, if an item is not applicable to your change.Testing
Before we can approve your change; please submit the following in a comment:
$ bin/fluent-bit -i systemd -p read_from_tail=on -o stdout -vSend SystemD logs
$ echo -e 'MESSAGE=test native message with multiple values\nKEY=value1\nKEY=value4\nKEY2=value2\nKEY=another\nKEY2=value2\nKEY2=value5\nKEY3=howdy\nKEY3=prettygood\nKEY2=value10\nKEY3=wow\nKEY2=final_field\n' | socat - UNIX-SENDTO:/run/systemd/journal/socketIf this is a change to packaging of containers or native binaries then please confirm it works for all targets.
ok-package-testlabel to test for all targets (requires maintainer to do).Documentation
Backporting
Fluent Bit is licensed under Apache 2.0, by submitting this pull request I understand that this code will be released under the terms of that license.